bitkeeper revision 1.1389 (4270a548HjJvvxATKrCShKKiLW-siw)

Cset exclude: vh249@arcadians.cl.cam.ac.uk|ChangeSet|20050427165530|30167

diff --git a/xen/Makefile b/xen/Makefile
index 9aee6df4c69505978f17883c1192bde518bf7888..f4a7c6f8d96944bc8530dabb5d2b208642af6f2d 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -47,7 +47,8 @@ clean: delete-unfresh-files
        rm -f include/asm-*/asm-offsets.h
        rm -f tools/figlet/*.o tools/figlet/figlet
 
-$(TARGET): delete-unfresh-files include/xen/compile.h
+$(TARGET): delete-unfresh-files
+       $(MAKE) include/xen/compile.h
        [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
        $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
        $(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -55,8 +56,9 @@ $(TARGET): delete-unfresh-files include/xen/compile.h
        $(MAKE) -C drivers
        $(MAKE) -C arch/$(TARGET_ARCH)
 
+# drivers/char/console.o may contain static banner/compile info. Blow it away.
 delete-unfresh-files:
-       rm -f include/xen/compile.h
+       rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
        $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
@@ -81,10 +83,9 @@ tools/figlet/figlet: tools/figlet/figlet.o
 tools/figlet/figlet.o: tools/figlet/figlet.c
        $(HOSTCC) -o $@ -c $<
 
-.PHONY: include/xen/banner.h
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
        tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
-       @cmp $@.new $@ && rm -f $@.new || mv -f $@.new $@
+       @mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
        @(set -e; \

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 7f2436dc0a52ab9cb236fae2fb6309f2de6f77a8..42d828f7f57fa200b020b361c7b45adc7318b9c8 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -13,7 +13,7 @@ endif
 
 default: $(TARGET)
 
-$(TARGET): $(TARGET)-syms boot/mkelf32 ../../include/xen/compile.h
+$(TARGET): $(TARGET)-syms boot/mkelf32
        ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000
 
 $(CURDIR)/arch.o: $(OBJS)

diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index d79e5451026dba2275b9e1e96530f1c23fda45f3..957a4bc5a2d595de773135a8bbf783aab567a2c8 100644 (file)
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -5,7 +5,5 @@ default: driver.o
 driver.o: $(OBJS)
        $(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
-console.o: ../../include/xen/banner.h
-
 clean:
        rm -f *.o *~ core